UI Changes #4

Changed the UI. Added Custom Buttons and updated label spacing