last layout fixes