UI changes, almost done