Updates based on UI changes and some edits for clarification