General fixes and embryo to admin space