More use of EL, fix for admin links