Re-organization - Final Commit

Re-organized content so that all the layout changes were in the layout
file, and all the type changes were in the type file. Added padding and
margin and display: inline to footer.