I just brought the dropdown for logout, user profile and settings back and also moved the constants to the top of the file. If there is nothing else my comments can be seen as 'solved' ;)