fixed (positioning)
resolve merge conflicts
Merge pull request #63 from ryanbahniuk/scrolling

fixed (positioning)