Layout fix
Merge branch 'origin/Semester'