Tidying of side and top nav includes.