tidying up nav and includes