annotate
removed unnecesary options
added some methods
removed fields
added controls in views
some changes