More widely used school types

'Independent' => 'Private'
'State-funded' => 'Public'
Subjects container better aligns with map