changed layouts and things in order to comply with Google Play policy