fixed main menu & some cleanup