Minor code and UI cleanup.