Refactor #3370: Remove width of viewport to avoid adaptation problems