HTML + UI improvements

Reviewer: Dan J (post)