Getting closer… fixed bugs in menu button etc