added removing-functionality and improved security during edit and adding-process