Fix menubar crash on removal (tentative) and minor scrollbar adjust