Fix css for small screens
Merge branch 'develop'