Update option/toggle template
Remove unnecssary btn state
Adjust active state style for outline btn