some simplifications and new main menu