Removed Some Stuff -  Add Stuff

Re-did alot of things an added more menus an features
Merge remote-tracking branch 'origin/master'