Code improvement on staticLayout branch.
Merge this branch into master or just use it as an inspirational one
Merge branch 'feature/staticLayout_code_improvement' into feature/staticLayout

Conflicts:
	index.html