Changed MasterView implementation