refactor forms a bit and first pass profile update