Final Changes for base Demo site