small style changes

Started moving about the styles to make it easier when changing to high
contrast view