Phase 1
Fixed horizontal scrolling issue.
Merge pull request #1 from stefan-gencarau/master

Phase 1
Merge pull request #2 from sayak-sarkar/patch-1

Fixed horizontal scrolling issue.
added some polish