Martin/21 mar support page changes