Removed unused code/fixed button layout