Changed layout to fix layout for Android platform