Bugfix Metadaten, fixed Layout