Added map display
Merge branch 'bbc' of https://github.com/oaeproject/3akai-ux into bbc