now puts fileds in correct places