#155 Improved deck page loading times