Fix mappings, admin top menu