More common code with ST3 port, added additional menu's entries