Added more remove buttons