Test map function from UI
Rearrange class order so form designer works