Moved CSS into appropriate places