making titles clearer, shorter and consistent
Fixed more minor labels