Improved admin application