Fix course layouts
Added comments