Updates to layout

Made changes to better reflect the storyboard.  Moved some items around
and renamed Chp. 4