End of day commit

Fixed a few minor issues. Prepared last two views to be migrated to
MVVM.