showing settings gear now, with click feedback
added a TODO
minor re-ordering of code and commenting
Merge branch 'develop' into reset-button
UI basically in for app settings and reset button
reset functionality is in, now need to do window history stuff
back button gets you out of app settings