Improved layout for short courses and switched to production