+ some UI changes yo