added back button and proper spacing of theme buttons