Edit screen refactored, Ad integration