Update JS formatting and page loader
