minor layout adjustments
Merge 3e5a5ac05f9d63d08deff12b179e9983c2177ffe into 3c0a18300eee65dfd698ea9a1502a572d8ee7815
minor layout adjustments