Refactored resource/privilege/role form