Added Load/Save
Small fixes
Improved design