refactored edit screens