touch and layout fixes