trying 3 column version
Fixing typos
Merge branch 'master' into schedule_option_2