added users, some more layout