Fixed #171
Issue #118: Migrated some content from the administration module.