Added users model, some UI modifications