Navigation and header fixes