edits to css

nothing major, just merging. also parse things have been initialized