adding labels
moving GenericManagementPage.php
improvements