Fixed layout issue
Started implementing new template engine + new template compiler