re-organize chart app