Revert to ruby 2.1 plus update layout & data query