Small tweaks to the style. It now looks more integrated.
Fixed merge conflicts