Add key handler
Use map when rendering