Added more categories, fixed 'back button'