Much better navigation flow, addressed #15 too.