refactor, show proper key map, nicer space