minor UI changes + bug