Clean up appearance; more workflow improvements