Jaime's JS cleanup and updates to style