Improve custom's sections rendering