selector cleanup and consolidated item selection styles