Modal and wizard updated

These are fully functional now, along with ajax submit to the server.