improvements Screen & Swipe Samples