Fix layout and highlight of buttons