small improvements to the annotations form
changed underlying annotations db structure