JS and style clean up