Implementing a new Loading UI and adding a Save button