Refactor edit content screen