Small refactor
Working on EditPage