Added functionality to control setting button
Merge branch 'UI'