SOS-1861 fix general styling
SOS-1861 rebase against master