Improve subnav layout to handle extra elements