Bug Fix - Layout issue overflow on remote screen