Finish contact static page
Finish DRY modifications