Map controls first cut
Merge branch 'bootstrap-upgrade' of github.com:adlorenz/btsearch into bootstrap-upgrade