replaced quik with jinja2
added layout for CLI