View and JS fixes