Made some improvements to the views, view models, and controllers based on manual testing.