Add preview modal and expanded view