Cleanup & made 'enter API key' screen friendlier.