small restructure and change of main menu