Cleaning up selector styling. SOCA-21