code refactoring
more refactoring
refactoring and css enhancements
Merge remote-tracking branch 'origin/master'

* origin/master:
  Added zepto and some minor modifications