Added TODO
Fixed option conflict in config UI