Some updates to improve responsive design