More fixes to js and display