more layout improvements