fix minor in page system & fix edit