UI changes, Added ability to add User specific option.