Refactor rendering process
structure for indicator single year