Formatting and save prompt fixes