implement updated layout.

move name to upper