Changed menu. Fixed some bugs