Styling and JS fixes