Merge branch 'hotfix/220-fixing-metadata-bugs'
gh #220 fixed layout bug (finally)
Merge branch 'hotfix/#220-bugfix' into develop