keep permission image to the right
Merge branch 'addfeatures' into testing