Bugfixes for smaller windows