organise CSS rules to make things a bit easier to find
remove pointless split of map css properties across id and class