UI Refresh + more work on saving images (images are now saved to storage)