Create and edit screens now share code and function similarly