Fixes for some layout edge cases

Gets rid of a check that should improve performance.
Investigate why it had to be gone and how much performance
penalty this change will cost us (I guess not that much).
[TASK] Commits merged release files
Improves the demo example slightly