Feature/85 map continue button