Random stuff, trying to improve the remove button