Redesign using JQuery and liveHandler