Added first version of map picker