Update user interface with functionality
Merge branch 'feature/notifications' into new_staging

* feature/notifications:
  Update user interface with functionality