Clean up and Edit moved to top