Touch support and arrows classname corrections