Changed: course and step layout