Fix for Android layout