added switch, icons on view modal changes now