minor layout changes and permission management