Several Bugfixes and Layout improvements.