Bugfixes, base for admin page