Added notifications and changed to spaces in codebase