Added more logic for Visiting Fragment