r440 - Final admin panel update