Moved logic to html properties presenter