Some fixes for side-menu. Still pretty flimsy.