- Separate edit UI in tabs to make it feel more spacious
- Add expiry field support