edit page/edit option functionalities and cleaned up some stuff