Fixed merge conflict issues with index page
Fixed merge conflicts with Add Group label names