Reorder/simplify some CSS styles