Cleaned up urls, added notification and validation