Next to last qss style improvements