made the buttons look well
Merge branches 'master' and 'dev'