some renamings, updated to work along with the main menu
added main menu