Added add new group button and fixed navigation errors