Bugfixes and Display issues