More widgets fixed