Fix conflict, display error messages on new entry, make title more prominent