merged UX smallbar changes