Redoing the button layout