Separate clip for chart and grid - #502