Adding Master Tool views and controllers