Fixed Settings save

Fixed saving and restoring the settings properly including redisplaying the