refactored a bit
new chart form updates