working on user settings ui
Merge remote-tracking branch 'origin/master'
fixed dat show images ui