polish UI, add "locations"