Finished up initial edit screen rebuild