I fixed it its all pretty and stuff

Removed a dupe bug and reorganised EVERYTHING.