Better templates and views filename handling