Fix the variant layout
Merge remote-tracking branch 'refs/remotes/origin/master' into dev
Add a 'forceEdit' flag. See #88