Added a header
Added comment activity
Working on highlighting