Adding saving support and UI changes