revised buttons of the app
Merge remote-tracking branch 'origin/master' into dev1