remove hammer, small js changes
update css