Changes -> afternoon of 3/19

Mostly changes to the views controller, bootstrap, etc.