Made workflow for selecting school smoother