Cleaned up edit screen