refractor layout done.