Added better loading (Changes to saving status on loading etc)