Refactor: programmatic map button