Added UI patch from nikhil.