Hygiene: Make construction of buttons easier