remove swp file
moved success/error message to template
removed swp file