Prettier UI for user, added some fields