fine tune header, classes and staff pages
fix conflict, remove old files