Layout fixes
Android support
Better screen detection
Better screen detection for Android