Status item selection fixes and cleanups