So you prefer the navigation buttons over a "hidden" drop down menu then ?
Did you ever try the earlier demo with your larger screens ?
I don't expect it to work 100% correctly yet, but it would be useful to see how it turns out, so I can see what still needs to be fixed up.