Added main menu, bugfixes (again)