Further tweaked clipping UI