More swipe handling, beginning of handheld layout