UI changes + fixes