Few more layout / header nav tweaks