merged css files and cleaned up a little