CSS fixes

Some spacing/margin issues