OOIION-1540 OOIION-1541 Fixes several styling issues