Fix of buttons and general styling.