some adjustments to layout and buttons