oops
map control and layoutand layout improvements