added more button mapping to OI