Added Menu
Code Clean Up