#7 merge fix :: staff menu item
#7 main menu merge fix
#7 merge fixes