Removed more unnecessary code plus tweaked. Started working on a menu