fix users index design
fix settings model
Merge branch 'improve-bootstrap' into sprint-2