add observer class
Merge branch 'remove_back_buttons'