Minor improvements for better new screen sizes support