OP-1150 fix and uniform ui style