VID-1148 Refactored to support mobile and desktop