404 page + some tidying here and there