improved class choosing

and menu of the app