Fixed edit part to work on single page