implement device view and collections
add new device animation to device view
fix merge conflicts