Fixing layout issue on email confirmation page + button stylings, refs #112
Merge branch 'develop' into staging