Move jinja logic to bottom and add spacing