Duplicate view and action fix