Updated map and moved GUI