Revert partially 0dcd0ff66812ddb7a1abebf4a31699733f4a945a because otherwise the markup files were missing at runtime
Fix CSS class for offset
Minor simplification
Fix minor typos in javadoc
Close img tag in template