Works on different screens.. Not what I wanted, but getting closer
Merge branch 'dev'