Added highlighted text
Added stupid arrow that took almost 1 hour
Fixed template view.
Merge remote-tracking branch 'origin/master'