Chart Display functionality complete and restructuring