Fixed #8 and updated layout files