fixing buttons, and layout