Layout added. Closes #33