Fixes #715 Contact page improvements