Refactor navigation stack, bugs still outstanding