Improve layout - Issue #13
Improve layout - Issue #13