Altered MasterFrame layout a bit