Bug/9075/usage styling

Not finished yet