bug fixes, loading spinner view seems useless..