Fixed the buttons
Merge branch 'development'