More style tweaks
Merge branch 'schedule_style' into develop