Updated button layout and some restructuring.