Close issue #8 - Layout