Layout: Enhancement for stash stuff

Improve behaviour for filling with white space

Fix issue #2.