improved UI, added terms support