reset button added; layout fix
Merge branch 'mz2'