multiple CI form improvements