Added role and capability based security to existing screens.