Added mapping and more complex default UI