Markup fixes in views