margins (issue #16)
updated layout (issue #12)