bug fix & prepare admin panel