Fixed some consistency issues, menus have extended functionality