Upgrading to angular for touch support