adding spinner on expand and fixing expand ui glitch