Added x button removal