Fixed edit view bugs