1st layout
renaming, layouting