Improved code for infopage