Enhancements in admin-panel as outlined in issue #34