Removed Menu

Removed Menu and also organized the code