Several UI changes. Minor doc update