Fix category issue
Fix nav