Added modified controller and Main classes after Sandeep's contribution to updated GUI