Scan Page fixes/enhancements/cleanup