Add view button to gridview
Fix merge conflict