Responsive UI + Fixes
Merge branch 'develop'