Updated with quickview and catlink options