moved some stuff
Merge pull request #32 from mreid1130/updated_layout

okie dokie