Add notifications and refactor search fields