shifting back to a non-ajax architecture
wizard2 modified