UI fix for API21