port sidebar functionality, and other clean-up and fixes