update: more layout cleanup