more layout fixes!