Fixed collapse button causing horizontal scroll
Merge branch 'develop' of https://github.com/lincolnloop/threads into develop