Major overhaul with easier navigation