Finished  Show/Edit of system pages.
Merge origin/master