Completed all save and submit functionality