Worked on the display of school home and fixed some other issues
merged conflicts