add choose option in Pickup places and fixed form layout in different resolution