Moved cancel application button, some more tests