renamed layout
Added test2 to test legacy application support