merging with upstream
improving the html template layout a bit more