responsive tweaks
Merge branch 'DevBranch' into stephen
responsive fixes, timeline finally works on android