Improve templating
Work on asset mgt