Added self checking

Also hid hide/remove button