issue-47 layout adjustments