Saturday work

MasterController should be 95% done.
Made a few changes to the jsps