correct shape rendering and adjust month labels