Cleaning up. Seperated Show and Edit