Completing Step 8, adding Master view and fixing a couple bugs.