updated UI according to permission flags
Merge remote-tracking branch 'origin/master'