Final layout changes.

Working on putting in class tomorrow.