Some progress made with menu although long lists look nasty - either needs to be 2 col or have a more... option