layout update
rework with new layout