User model bug fix, some extra styling