Added User, refactor dialog, move entities around