Building info panel + Bugfixes