refacting and more changes..
implemented ICommand for activate/deactivate buttons
started work on the map + refactoring