Fix fatal error
Cleanup
Remove button was hidden sometimes