Some UI fixes , getting closer to a working mapper.