fixes to nav, remove xtra border from attempting to merge