made changes to Users app
several changes to cms app