improved styling- hopefully
Merge branch 'scheduler' into scheduler-dev