edit forms unified and fixed
hints and messages added