Minor changes
Merge origin/master
Fix of cancel button in Record