redraw whole form post pic upload, other minor cleanup