Bugfix + Touch support
Bugfix for non-FF browsers