Major fixes for mobile view