Finished layout and tests