Some fixes.. Working with user's control panel