Future major features

Navigation overhaul