Edit screen completed. Issues #23 and #22 resolved.