Modify topic page.
Merge origin/InigoBranch into EjayBranch
UI changes