Correct Categories in CategoriesBox
ClickListener Fix

Changed clicklistener and defined the way we switch between views