Modify the register view
Merge master branch