fix mobile view
fix mobile view + merge with master