Overhauled UI navigation to use less popups and more pages