Small UI changes, and code formatting