Finalize rev. 1 layout