merged css
Fixed collapsing
general tidy up