Fixed navigation layout issues for 5 and 6 column layouts