Bug Fixing and page updates