Improve search results display & add display for Users, Comments, Answers etc
Resolve conflicts after amend commit