Second batch of ORA UI fixes (with an ICE bonus!)

@VikParuchuri & @jbau - here's the most recent set of ORA/ICE changes