improving blocked and loading states and spinners handle