Decreases chance of tapping the wrong button on contact form
Build optimisation
Merge branch 'v2'