Merge refactored edit page to master