Update for new JTV layout