Fix field labels names / ids and cleanup