BRANCH 4.3: fixed edit side bar temporarily