Main class code update

Some code in main class changed to accommodate menu