Fix selector to align all button types