UI improvements/fixes
more UI/JS fixes