Several changes

Made several changes to various positions, alignments, margins, etc...