Merge pull request #30 from mreid1130/updated_layout

reviewed and ok'd
Merge pull request #31 from mreid1130/updated_layout

ok'd
moved some stuff