Few tweaks for success-message