fixed n+1 query warning
new highlight page
textfix
cleared up the view
merge conflict