Fixed Save Dialog Mess
Some final Changes