Added main model and view classes for the 2nd screen, other minor cleanup.