Fix layout and rename ids