Added mobile and desktop first approach, fixed variables naming convetion