Fixed category navigation
Removed unused code
Fixed proper drawer/action bar interaction