Add pill and hover states