Fixed Triage view
Fixed buttons on Triage page
Merge pull request #91 from delasteve/merge-views

#65 - Partial merging of views