Add better controls to cms