Fixed edit and user views