optimizing layout, adding school layer data, fixes #52