Updated MasterPage with Glenn's updates