Fix sidemenu, and minor cleanup