Some changes to try to support mobile better