Markup fixes
Modal windows for topics