Moved wizard pages to own package and cleaned up several details