Merge from Fuel UX 2.3.0
minor style changes in alignment with styleguide