Better layout for exercise 2