More UI and style updates, small API change