Fixed category navigation
Removed unused code