Switching Arrays to Lists
Work on layouts
Merged Jeromy's Branch