Feature/admin site fixes