rework layout and UVP