trying to merge with UI changes from 5c3c6728c80672947bcc7f50ec9a738dcbe7b958
merging