Added fill for oval and circle