remodeling Gene and some admin forms. Closes issue #3