Few Fixes, Added message box and wait cursor