tweaked layout files
all tests passing