Fix User Menu dropdown issues, refactor