Changed layout slightly and re-enabled som exercises I accidentaly left out last commit,