improvements with mobile view

Change-Id: I5bec98d28d4d9e34658783eda50d2fc60187c067