Add User Entity/Repository/FE controller, clean up builder modal