Update maps UI, remove 2 devices