menu highlighting fixed amongst other things