starting to cleanup Layout and add some basic docmentation