-add active style to icons in edit page
Merge origin/master
-minor modification of the style in edit page.
-try navigation bar
-try navigation bar