More menu tweaking