Rework UI on multiple screens