Cleaned up some buttons in the layout