Got display fixed, still working on save