added remove page and fixes