Updates
* removed unsed buttons
* map as hole display
* removed explicit keys
code refactor