UI tweaks, and using new ICAT API for speed