Updated layouts and unit tests