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