Finish first version (only one layout)