Better templates rendering management. Minor tweaks.
Release v0.5.1