Changed around a whole bunch of front end stuff
Fixed conflicts