Started saving and improved menu