Updated versions
Created a layout controller
Various minor updates