Button management on initiator page
resolving merge conflict
Merge pull request #27 from Surram/index_view

Index view
Resolved merge conflict with master