Merged in the current layouts to the project. Still need to hook them
all up to the existing code.