Fixed panel on adding, removing still lacking