Fixed Gradle build error + layout tweeks.