Start of incorporating nav buttons into User Menu, refactor, edit comments