playing with settings button. Disabled function for now.
Merge branch 'development' into ltest