Remove/add button fixes