Menu stuff again

A bit better now...