Tweaked designer navigation menu, hoping to automate the layout more