Adding pagination, command object and jquery
fixing conflicts