two Columns fixes #6
Convert includes to html