Added school id to school report
Fixing alignment issues