Fix inconsistent padding and unnecessary use of negative margins in sub nav, fixes #5459