ticket:8 Admin interface improvements
Merge branch 't_8_edit_in_admin'