OPICMS-72 some styling
OPICMS-72 improved styling issues