Add factory to buttonlist component
Add buttons as sub-component
remove old geo-picker button