A few OE UI fixes

@VikParuchuri here's my 4 OE fixes