unit test update
fix layout drag/drop
fix layout devices drag / drop