on-site changes for UX. merging master & release-1