* Improved software page generation