Chapter04 screens updated