Simplified and cleaned up navigation