layout fixes and buttons