Fix the remove-btn visibility