Brett - Header margin cleanup, sub-nav style fix