Top and Main navigation update

Sizes, spaces fixes.