code refactor, notifications, loading icon