Small improvements and added a main menu