Bug fixes but untested with known issue in xs responsive view