Cleaned. More flexible screen borders.