Add auto closes and success message