Design improved (buttons)