CON-1140: Error handling
CON-1140: Better placement of save button
CON-1140: Trim fields
Merge pull request #3591 from Wikia/CON-1140