Improved deck new/edit/show performance