bug fixing and admin panel comfort