Bugfixes: improve multi-line labels, improve layouting