Further shaping of the UI