added some minor bugfixes with extended screen