Issue #216 Fixed the layout