Various menu fixes