New edit

Inner page mostly resolved