Bugfixes + text as labels