Added page controlls and notification