admin UI improvements
Merge pull request #796 from andrzej-jankowski/admin_improvements

Admin UI improvements