3434ac8 Continued work on sidebar fixes, menu some other stuff