Improvements after browser testing