fixed table display
merged permissions