Copied the responsive part from the main branch