Improvements to two wizard pages