Asif

I made changes to Asif's two UI mockups to get them working for the Sprint1 integration test.

This was a pretty sloppy job on my part -- we need better tests, and we should go over the structure of how these screens should be constructed/integrated into the final application. 

For now, they should work -- try running the Sprint1 integration test and see what happens!