some further layout adjustments