Improve courses layout to be more flexible

2 jobs for develop
in 1 minute and 32 seconds and was queued for 2 seconds