added containers around buttons, plus various layout tweaks