merged smartbar improvements
merged bug fixes and scroll performance improvements