Improved menu with new admin drop-down and moved logout to user drop-down