initial revamp
moved logic to jquery plugin
merge revamp 2014