Resolved conflict and merged master. Omitted 'click here' from links.
Redesigned most of template