Various alignment, front and margin changes.
Merge branch 'master' into checkbox-styling