Unsay/ux referesh fix merge

@unsay I merged master and tried to so a small amount of cleanup on this PR. If you wanted to give it a once over again before we pull it back into master that would be sweet.

Thanks!