#9: Added tables to annotation field and fixed moving and adding
problems.