Better CSS, removed unused code