JOJ-80: Changes to HTML layout