Week 4 Commit

Layout finished, everything looks to be in order, continuing with the
rest of the assignment