Completed layout

Layout is complete as specified in homework. Must still implement
behavior