Fix misaligned cancel button. Fixes #1
Merge branch 'dev' into stage
Merge branch 'stage'