UI changes & Save/load improvements