Main menu improvement + bug fixes