Bunch of changes, edit is bring up page