Nav drawer fixes