edit page & fixes