UI and style changes. (v3.1.2)