more layout polish