adding touch and improving layout