Major CSS overhall and refactor