Merge pull request #241 from eko/master

Fix navigation layout to be fully expanded
Update BlockIterator to be able to define layout setting