Fix admin interface after refactoring

Squashed commit of the following:

commit ba700b3a90d9e7c08ff5d8ec9ab8555f1a318820
Author: Jonasz Grochowski <tensaioni@gmail.com>
Date:   Fri Jun 20 10:47:15 2014 +0200

    Fix admin interface after refactoring