UI layout rework + improvements