Finished layout changes for GR4.
Merging my layout changes w/ Michelle's commit.
Merge branch 'master' of http://github.com/jtwarren/mit_fixit