Updated Version of MapCommand

Neue Buttons, etc.