Fixed layout bug, issue #8