improve layout of buttons