Finishing touches on edit page, bugfixes