Replace inline style with existing CSS class
Fix use order