Fixing up CSS and alignments