Consolidate fields

Use consistent fields across all screens. 

<img width="320"  alt="Image" src="https://github.com/user-attachments/assets/36344c7a-cb8c-4d90-8577-96d5534180d0" />

<img width="320"  alt="Image" src="https://github.com/user-attachments/assets/63aae2be-9746-41c9-86dd-294b9bf9bc29" />