further layout fixes