Fix problem of disapearing settings
Fix minor label issues