Pulling from testing: more layout fixes