Changes in layout to organize buttons