Custom contact webform + some fixes