Add pages control and changed app root