UI issues fixes with Shape and Animation Panels