Fix formatting

General fixes, partially in preparation for moving to bootstrap to make the site look prettier with css.