#353 nicer looking button toolbar layout