Added Edit Modal and fixed Image View