Merge branch 'hotfix/#3'
Continuation from #6
Fixed an issue relating to #15 where the main container was not hiding the overflow correctly.
Continuation of #15