More style and UI changes