add gmd namespace, some layut fixes