Merge pull request #1 from TanawatRaitim/Development

Edit select new table, edit template