Sortin out menus and logout. There currently seems to be an issue when logging out. THe logout controller is bypassed. Look into this.