Added Cancel Button, improved GUI