UI changes
Merge branch 'settings' of github.com:naropax/BigBrother into settings