vertical resize, canvas resize, css tweaks
Merge remote branch 'origin/master'