Enhancement: Simplified the nav bar links