Updated UI, still working on consistent saving