Make my copy + UI edit improve
Improve ergonomics