Updated Android and Assets/Desktop design