reorganized main menu
small jsf fixes