Code refactoring, add angular-notify and data input function update