add spinner and fix css