Add css, fixed nesting issues
Pull changes