Continued work on sidebar fixes, menu some other stuff