Clean up ACL view a bit, improve controller functions