Changes with user side and Admin edition part