Fix CSS styling, fixes both ENTMQ-291 and ENTMQ-372