Update to latest angular version, refine templates and config