Few small changes - more to fix
Fixes for admin widgets