Fixes for Database, Added Loading Bar