added page package, and cancel button, lol