button fix and messages redirect
Merge branch 'master' into button-fix