Combined CSS into a single base.css file. Other modifications/bug fixes