incremental
more layout fixes