Cleaned up new and edit account looks