Update page contend and tidy up for mozspace-tp page