refactor room map display
manual merge