Bug Fix - Layout issue remote screen