changed charting and form to be in same inline