Clean up

Removed un-needed stuff, and reorganised css