fixing review page and moving more stuff around in form