Fixed feature and navigation - complete overhaul