added spinner and completed other fixes