Made changes to support web mobile view