Add smarttab and scollingset
Fix conflict