Implemented edit page, bugfixes