improve layout and ux