More enhancements and page additions