Nav/heading fixes