Edit changes, minor UI fixes