added spinner and some more stuffs