Double-Saving-Bug fixed + some styles