More touchscreen progress
Wrestling with layout for mobile