Made widgets & translation better